Rename gtk-query-immodules to follow our binary naming scheme

Instead of gtk-query-immodules-4.0, lets call it gtk4-query-immodules,
to use the same prefix as all the other versioned binaries.

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 27afb34b16196f294fe4155f56d896ea108847c8..4d317bb8ce4724733e3ebdee1e85b2403ce460ac 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -293,7 +293,7 @@ content_files =                                     \
        gtk-builder-tool.xml                    \
        gtk-encode-symbolic-svg.xml             \
        gtk-launch.xml                          \
-       gtk-query-immodules-4.0.xml             \
+       gtk4-query-immodules.xml                \
        gtk-query-settings.xml                  \
        gtk-update-icon-cache.xml               \
        input-handling.xml                      \
@@ -496,7 +496,7 @@ EXTRA_DIST += version.xml.in gtk4.types.in
 ########################################################################
 
 man_MANS =                             \
-       gtk-query-immodules-4.0.1       \
+       gtk4-query-immodules.1          \
        gtk-update-icon-cache.1         \
        gtk-encode-symbolic-svg.1       \
        gtk-launch.1                    \

diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 5ad8250ec1d7ff59cb7ccc5a93e65848a357a89f..626ea7d90b49af1391f93e6b82fe71ace1eb16f4 100644 (file)
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -363,7 +363,7 @@
     <xi:include href="gtk4-demo-application.xml" />
     <xi:include href="gtk4-widget-factory.xml" />
     <xi:include href="gtk4-icon-browser.xml" />
-    <xi:include href="gtk-query-immodules-4.0.xml" />
+    <xi:include href="gtk4-query-immodules.xml" />
     <xi:include href="gtk-update-icon-cache.xml" />
     <xi:include href="gtk-encode-symbolic-svg.xml" />
     <xi:include href="gtk-builder-tool.xml" />

diff --git a/docs/reference/gtk/gtk-query-immodules-4.0.xml b/docs/reference/gtk/gtk-query-immodules-4.0.xml
deleted file mode 100644 (file)
index f184b53..0000000
--- a/docs/reference/gtk/gtk-query-immodules-4.0.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk-query-immodules-4.0">
-
-<refentryinfo>
-  <title>gtk-query-immodules-4.0</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Matthias</firstname>
-      <surname>Clasen</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>gtk-query-immodules-4.0</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>gtk-query-immodules-4.0</refname>
-  <refpurpose>Input method module registration utility</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk-query-immodules-4.0</command>
-<arg choice="opt">--update-cache</arg>
-<arg choice="opt" rep="repeat">MODULE</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gtk-query-immodules-4.0</command> collects information about loadable
-input method modules for GTK+ and writes it to the default cache file
-location, or to <filename>stdout</filename>.
-</para>
-<para>
-If called without arguments, it looks for modules in the GTK+ input method
-module path.
-</para>
-<para>
-If called with arguments, it looks for the specified modules. The arguments
-may be absolute or relative paths.
-</para>
-
-<para>
-Normally, the output of <command>gtk-query-immodules-4.0</command> is written
-to <filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename>,
-where GTK+ looks for it by default. If it is written to some other location,
-the <envar>GTK_IM_MODULE_FILE</envar> environment variable can be set to point
-GTK+ at the file.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-<variablelist>
-  <varlistentry>
-    <term>--update-cache</term>
-    <listitem><para>Write the output to the default cache location instead of
-                    <filename>stdout</filename></para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1><title>Files</title>
-<variablelist>
-  <varlistentry>
-    <term><filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename></term>
-    <listitem><para>The default im cache file used by GTK+ applications</para></listitem>
-  </varlistentry>
-</variablelist>
-
-</refsect1>
-
-<refsect1><title>Environment</title>
-<variablelist>
-  <varlistentry>
-    <term><link linkend="gtk-path"><envar>GTK_PATH</envar></link></term>
-    <listitem><para>Prepends directories to the input method module path</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><link linkend="gtk-im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link></term>
-    <listitem><para>Specifies an alternative im module cache for GTK+
-    applications</para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-</refentry>

diff --git a/docs/reference/gtk/gtk4-query-immodules.xml b/docs/reference/gtk/gtk4-query-immodules.xml
new file mode 100644 (file)
index 0000000..59512f1
--- /dev/null
+++ b/docs/reference/gtk/gtk4-query-immodules.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-query-immodules">
+
+<refentryinfo>
+  <title>gtk4-query-immodules</title>
+  <productname>GTK+</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-query-immodules</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-query-immodules</refname>
+  <refpurpose>Input method module registration utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-query-immodules</command>
+<arg choice="opt">--update-cache</arg>
+<arg choice="opt" rep="repeat">MODULE</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk4-query-immodules</command> collects information about loadable
+input method modules for GTK+ and writes it to the default cache file
+location, or to <filename>stdout</filename>.
+</para>
+<para>
+If called without arguments, it looks for modules in the GTK+ input method
+module path.
+</para>
+<para>
+If called with arguments, it looks for the specified modules. The arguments
+may be absolute or relative paths.
+</para>
+
+<para>
+Normally, the output of <command>gtk4-query-immodules</command> is written
+to <filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename>,
+where GTK+ looks for it by default. If it is written to some other location,
+the <envar>GTK_IM_MODULE_FILE</envar> environment variable can be set to point
+GTK+ at the file.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>--update-cache</term>
+    <listitem><para>Write the output to the default cache location instead of
+                    <filename>stdout</filename></para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1><title>Files</title>
+<variablelist>
+  <varlistentry>
+    <term><filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename></term>
+    <listitem><para>The default im cache file used by GTK+ applications</para></listitem>
+  </varlistentry>
+</variablelist>
+
+</refsect1>
+
+<refsect1><title>Environment</title>
+<variablelist>
+  <varlistentry>
+    <term><link linkend="gtk-path"><envar>GTK_PATH</envar></link></term>
+    <listitem><para>Prepends directories to the input method module path</para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><link linkend="gtk-im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link></term>
+    <listitem><para>Specifies an alternative im module cache for GTK+
+    applications</para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+</refentry>

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4d94114a723a71cfa803f5720000c3ae8da7af6d..92c2af2dee2cb3bd6020c33ce3cf9aab91b81e57 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1552,15 +1552,15 @@ endif
 # Installed tools
 #
 bin_PROGRAMS = \
-       gtk-query-immodules-4.0 \
+       gtk4-query-immodules    \
        gtk-update-icon-cache \
        gtk-encode-symbolic-svg \
        gtk-builder-tool \
        gtk-query-settings \
        gtk-launch
 
-gtk_query_immodules_4_0_SOURCES = queryimmodules.c gtkutils.c
-gtk_query_immodules_4_0_LDADD =                \
+gtk4_query_immodules_SOURCES = queryimmodules.c gtkutils.c
+gtk4_query_immodules_LDADD =           \
        libgtk-4.la                             \
        $(top_builddir)/gdk/libgdk-4.la         \
        $(top_builddir)/gsk/libgsk-4.la         \

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index eb73699640dc8086cd0238d5e0a96bd27e72d88f..0388c1fe72d3739bb575d5fdd88779e2ef596267 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -209,14 +209,14 @@ install-data-hook:
        $(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \
          echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
          $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
-         echo "$(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache" ; \
-         $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache ; \
+         echo "$(top_builddir)/gtk/gtk4-query-immodules$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache" ; \
+         $(top_builddir)/gtk/gtk4-query-immodules$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache ; \
        else \
          echo "***" ; \
          echo "*** Warning: immodules.cache not built" ; \
          echo "***" ; \
          echo "*** Generate this file manually on host" ; \
-         echo "*** system using gtk-query-immodules-4.0" ; \
+         echo "*** system using gtk4-query-immodules" ; \
          echo "***" ; \
         fi
 
@@ -262,7 +262,7 @@ noinst_LTLIBRARIES =                                \
 included-modules: $(noinst_LTLIBRARIES)
 
 immodules.cache: Makefile.am $(module_LTLIBRARIES)
-       $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache
+       $(AM_V_GEN) $(top_builddir)/gtk/gtk4-query-immodules$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache
 
 EXTRA_DIST += README.multipress